From 97dbeec935516a9e4c840383bc7858aeeffa6689 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 18 Nov 2003 21:38:54 +0000 Subject: [PATCH] the total number of actions is "matches + actions - 1". (Fixes #126572). Tue Nov 18 22:26:30 2003 Kristian Rietveld * gtk/gtkentry.c (gtk_entry_completion_key_press): the total number of actions is "matches + actions - 1". (Fixes #126572). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkentry.c | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e24ebc36f5..821e9efbfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 18 22:26:30 2003 Kristian Rietveld + + * gtk/gtkentry.c (gtk_entry_completion_key_press): the total + number of actions is "matches + actions - 1". (Fixes #126572). + Tue Nov 18 21:05:05 2003 Christian Persch * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e24ebc36f5..821e9efbfe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Nov 18 22:26:30 2003 Kristian Rietveld + + * gtk/gtkentry.c (gtk_entry_completion_key_press): the total + number of actions is "matches + actions - 1". (Fixes #126572). + Tue Nov 18 21:05:05 2003 Christian Persch * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e24ebc36f5..821e9efbfe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Nov 18 22:26:30 2003 Kristian Rietveld + + * gtk/gtkentry.c (gtk_entry_completion_key_press): the total + number of actions is "matches + actions - 1". (Fixes #126572). + Tue Nov 18 21:05:05 2003 Christian Persch * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e24ebc36f5..821e9efbfe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Nov 18 22:26:30 2003 Kristian Rietveld + + * gtk/gtkentry.c (gtk_entry_completion_key_press): the total + number of actions is "matches + actions - 1". (Fixes #126572). + Tue Nov 18 21:05:05 2003 Christian Persch * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e24ebc36f5..821e9efbfe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Nov 18 22:26:30 2003 Kristian Rietveld + + * gtk/gtkentry.c (gtk_entry_completion_key_press): the total + number of actions is "matches + actions - 1". (Fixes #126572). + Tue Nov 18 21:05:05 2003 Christian Persch * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index e9af219373..8f97dcf594 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4575,8 +4575,8 @@ gtk_entry_completion_key_press (GtkWidget *widget, else if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down) { completion->priv->current_selected++; - if (completion->priv->current_selected >= matches + actions) - completion->priv->current_selected = matches + actions; + if (completion->priv->current_selected > matches + actions - 1) + completion->priv->current_selected = matches + actions - 1; } else if (event->keyval == GDK_Home || event->keyval == GDK_KP_Home) completion->priv->current_selected = -1; -- 2.30.2